Fix build, links.

diff --git a/babl/meson.build b/babl/meson.build
index 59cb88c96d4fd258cc137f63e255d2d6f507bb7b..64bffdf1914ec23402f57f4d4fae491f1365175f 100644 (file)
--- a/babl/meson.build
+++ b/babl/meson.build
@@ -82,4 +82,6 @@ babl = library('babl',
   include_directories: [ rootInclude, bablBaseInclude],
   c_args:   [ '-DLIBDIR="' + get_option('libdir') + '"', ],
   cpp_args: [ '-DLIBDIR="' + get_option('libdir') + '"', ],
+  link_with: [ babl_base, ],
+  dependencies: [ math, thread, dl, ],
 )

diff --git a/meson.build b/meson.build
index 68aac9ce5ec035c3ae477bdf0a12da63c0c917b5..098e83ec541566134d7732f6c6cefd33f2cb37c5 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -116,8 +116,8 @@ platform_android = host_os.contains('android')
 
 path_sep = ( os_win32 ? ';'  : ':' )
 dirs_sep = ( os_win32 ? '\\' : '/' )
-conf.set('BABL_PATH_SEPARATOR', path_sep)
-conf.set('BABL_DIR_SEPARATOR',  dirs_sep)
+conf.set('BABL_PATH_SEPARATOR', '\'' + path_sep + '\'')
+conf.set_quoted('BABL_DIR_SEPARATOR',  dirs_sep)
 
 ################################################################################
 # Extra warnings
@@ -218,6 +218,8 @@ else
   log = []
 endif
 
+dl = cc.find_library('dl')
+
 
 pkgconfig.generate(filebase: 'babl',
   name: 'babl',